Skip to content

model predict: move getModel from rest to transport #3687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

model predict: move getModel from rest to transport #3687

wants to merge 1 commit into from

Conversation

jngz-es
Copy link
Collaborator

@jngz-es jngz-es commented Mar 26, 2025

Description

To prevent security issue, put index read behind transport call.

Related Issues

#3651

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@jngz-es
move getModel from rest to transport
eee764d 
Signed-off-by: Jing Zhang <jngz@amazon.com>
@jngz-es jngz-es had a problem deploying to ml-commons-cicd-env March 26, 2025 17:51 — with GitHub Actions Error
@jngz-es jngz-es had a problem deploying to ml-commons-cicd-env March 26, 2025 17:51 — with GitHub Actions Error
@jngz-es jngz-es had a problem deploying to ml-commons-cicd-env March 26, 2025 17:51 — with GitHub Actions Failure
@jngz-es jngz-es had a problem deploying to ml-commons-cicd-env March 26, 2025 17:51 — with GitHub Actions Failure
@jngz-es jngz-es had a problem deploying to ml-commons-cicd-env March 26, 2025 18:33 — with GitHub Actions Error
@jngz-es jngz-es had a problem deploying to ml-commons-cicd-env March 26, 2025 18:33 — with GitHub Actions Failure
@jngz-es jngz-es had a problem deploying to ml-commons-cicd-env March 26, 2025 18:33 — with GitHub Actions Failure
@jngz-es jngz-es had a problem deploying to ml-commons-cicd-env March 26, 2025 18:33 — with GitHub Actions Error
ylwu-amzn
ylwu-amzn reviewed Mar 26, 2025
View reviewed changes
plugin/src/main/java/org/opensearch/ml/rest/RestMLPredictionAction.java
};
MLPredictionTaskRequest predictionRequest = getRequest(
modelId,
Objects.requireNonNullElse(userAlgorithm, functionName.get().name()),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible both userAlgorithm and functionName are null?

ylwu-amzn
ylwu-amzn reviewed Mar 26, 2025
View reviewed changes
plugin/src/main/java/org/opensearch/ml/rest/RestMLPredictionAction.java
});
try (ThreadContext.StoredContext context = client.threadPool().getThreadContext().stashContext()) {
modelManager
.getModel(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After refactoring, this method will not be invoked, is that correct ?

@jngz-es
Copy link
Collaborator Author

jngz-es commented Mar 26, 2025

Got a test failure as below, looking into it.

RestMLRemoteInferenceIT > testPredictWithAutoDeployAndTTL_RemoteModel FAILED
    org.opensearch.client.ResponseException: method [POST], host [http://127.0.0.1:50334/], URI [/_plugins/_ml/models/lvvV05UBs7bCuZJ1kON-/_predict], status line [HTTP/1.1 500 Internal Server Error]
    {"error":{"root_cause":[{"type":"no_such_element_exception","reason":"No value present"}],"type":"no_such_element_exception","reason":"No value present"},"status":500}
        at __randomizedtesting.SeedInfo.seed([93AC97C5F10084B1:2630A5DEADA1287B]:0)
        at app//org.opensearch.client.RestClient.convertResponse(RestClient.java:501)
        at app//org.opensearch.client.RestClient.performRequest(RestClient.java:384)
        at app//org.opensearch.client.RestClient.performRequest(RestClient.java:359)
        at app//org.opensearch.ml.utils.TestHelper.makeRequest(TestHelper.java:184)
        at app//org.opensearch.ml.utils.TestHelper.makeRequest(TestHelper.java:157)
        at app//org.opensearch.ml.utils.TestHelper.makeRequest(TestHelper.java:146)
        at app//org.opensearch.ml.rest.RestMLRemoteInferenceIT.predictRemoteModel(RestMLRemoteInferenceIT.java:1120)
        at app//org.opensearch.ml.rest.RestMLRemoteInferenceIT.testPredictWithAutoDeployAndTTL_RemoteModel(RestMLRemoteInferenceIT.java:243)

pyek-bot
pyek-bot reviewed Mar 28, 2025
View reviewed changes
plugin/src/main/java/org/opensearch/ml/action/prediction/TransportPredictionTaskAction.java
Comment on lines +282 to +285
} else if (FunctionName.isDLModel(FunctionName.from(modelType.toUpperCase(Locale.ROOT)))
&& !mlFeatureEnabledSetting.isLocalModelEnabled()) {
throw new IllegalStateException(LOCAL_MODEL_DISABLED_ERR_MSG);
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: redundant else if, can be a separate if block

pyek-bot
pyek-bot reviewed Mar 28, 2025
View reviewed changes
plugin/src/main/java/org/opensearch/ml/rest/RestMLPredictionAction.java
Comment on lines -146 to +105
if (FunctionName.REMOTE.name().equals(modelType) && !mlFeatureEnabledSetting.isRemoteInferenceEnabled()) {
throw new IllegalStateException(REMOTE_INFERENCE_DISABLED_ERR_MSG);
} else if (FunctionName.isDLModel(FunctionName.from(modelType.toUpperCase(Locale.ROOT)))
&& !mlFeatureEnabledSetting.isLocalModelEnabled()) {
throw new IllegalStateException(LOCAL_MODEL_DISABLED_ERR_MSG);
} else if (ActionType.BATCH_PREDICT == actionType && !mlFeatureEnabledSetting.isOfflineBatchInferenceEnabled()) {
if (ActionType.BATCH_PREDICT == actionType && !mlFeatureEnabledSetting.isOfflineBatchInferenceEnabled()) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ylwu-amzn ylwu-amzn ylwu-amzn left review comments

@pyek-bot pyek-bot pyek-bot left review comments

@b4sjoo b4sjoo Awaiting requested review from b4sjoo b4sjoo is a code owner

@dhrubo-os dhrubo-os Awaiting requested review from dhrubo-os dhrubo-os is a code owner

@mingshl mingshl Awaiting requested review from mingshl mingshl is a code owner

@model-collapse model-collapse Awaiting requested review from model-collapse model-collapse is a code owner

@rbhavna rbhavna Awaiting requested review from rbhavna rbhavna is a code owner

@zane-neo zane-neo Awaiting requested review from zane-neo zane-neo is a code owner

@Zhangxunmt Zhangxunmt Awaiting requested review from Zhangxunmt Zhangxunmt is a code owner

@austintlee austintlee Awaiting requested review from austintlee austintlee is a code owner

@HenryL27 HenryL27 Awaiting requested review from HenryL27 HenryL27 is a code owner

@xinyual xinyual Awaiting requested review from xinyual xinyual is a code owner

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jngz-es @ylwu-amzn @pyek-bot